[code sync] Merge code from sonic-net/sonic-swss:202605 to 202606#246
Merged
Conversation
mssonicbld
commented
Jun 25, 2026
Collaborator
### What I did In `DashHaOrch::updateHaScopeStateForSwitchOwner`, log a `SWSS_LOG_WARN` when the referenced HA Set entry is missing, and still proceed to update the HA Scope state DB. Early-return is now taken only when the HA Set exists and its owner is not `HA_OWNER_SWITCH`. ### Why I did it Previously the function returned silently when the HA Set entry was not yet available, making it hard to diagnose why `DPU_STATE_DB` HA Scope state was not refreshed. ### How I verified it Built locally and reviewed call sites — `m_ha_set_entries.find()` is guarded before any dereference, and `m_ha_scope_entries[key]` is only reached after the entry has been inserted. Signed-off-by: Sonic Build Admin <sonicbld@microsoft.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.